nvme: keepalive fixups - #3998
Merged
Merged
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR updates the OpenHCL NVMe keepalive servicing coverage by making the fused-keepalive test actually cross a servicing boundary, and adds a restore-time invariant check for fused keepalive devices to detect unexpected admin-queue activity.
Changes:
- Update the fused keepalive NVMe test to restart OpenHCL with NVMe keepalive enabled and re-validate fused vs non-fused behavior post-servicing.
- Add a restore-time check that panics if a fused-keepalive device is restored with a non-empty admin queue.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| vmm_tests/vmm_tests/tests/tests/multiarch/openhcl_servicing.rs | Extends the fused keepalive test to perform an OpenHCL restart (servicing) with NVMe keepalive enabled and re-check device fusion state afterward. |
| vm/devices/storage/disk_nvme/nvme_driver/src/driver.rs | Adds a fused-keepalive restore-time assertion by panicking when pending admin commands exist during admin queue restore. |
Comment on lines
+910
to
+916
| if fused_keepalive_device && pending_commands_count > 0 { | ||
| panic!( | ||
| "fused keepalive device {pci_id} restored with a non-empty admin \ | ||
| queue ({pending_commands_count} pending commands); fused devices \ | ||
| must not issue admin commands after init" | ||
| ); | ||
| } |
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: ad2f5a78-7441-43d3-9679-9de10f68a9c3
babayet2
added
the
backport_1.8.2607
Collaborator
Author
|
@mattkur the panics in this PR are already in 1.7, we want it in main, and backported to 1.8 |
mattkur
approved these changes
Jul 30, 2026
This was referenced Jul 30, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Improves the keepalive tests to actually run servicing, and adds a panic when there is a write to the admin queue in fused mode